9b2bad
@@ -2169,20 +2169,25 @@
private VectorExpression getCustomUDFExpression(ExprNodeGenericFuncDesc expr, Ve
 
     for (int i = 0; i < childExprList.size(); i++) {
       ExprNodeDesc child = childExprList.get(i);
+      /*
+      UNDONE: Until we fix scratch column allocation to not release after each expression, we
+      UNDONE: cannot have another other than a column or constant in the parameter list.
       if (child instanceof ExprNodeGenericFuncDesc) {
         VectorExpression e = getVectorExpression(child, VectorExpressionDescriptor.Mode.PROJECTION);
         vectorExprs.add(e);
         variableArgPositions.add(i);
         exprResultColumnNums.add(e.getOutputColumn());
         argDescs[i].setVariable(e.getOutputColumn());
-      } else if (child instanceof ExprNodeColumnDesc) {
+      } else 
+      */
+      if (child instanceof ExprNodeColumnDesc) {
         variableArgPositions.add(i);
         argDescs[i].setVariable(getInputColumnIndex(((ExprNodeColumnDesc) child).getColumn()));
       } else if (child instanceof ExprNodeConstantDesc) {
         // this is a constant (or null)
         argDescs[i].setConstant((ExprNodeConstantDesc) child);
       } else {
-        throw new HiveException("Unable to vectorize custom UDF. Encountered unsupported expr desc : "
+        throw new HiveException("Unable to use the VectorUDFAdaptor. Encountered unsupported expr desc : "
             + child);
       }
     }
